diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx
new file mode 100644
index 0000000000..3511bb1fea
--- /dev/null
+++ b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/legacy_materials_test.mtlx
@@ -0,0 +1,413 @@
+<?xml version="1.0"?>
+<materialx version="1.38" colorspace="lin_rec709">
+
+  <!-- Sample of each legacy class
+  -->
+
+  <legacy_mirror name="SR_legacy_mirror" type="surfaceshader" >
+    <input name="color" type="color3" />
+    <input name="tint_enable" type="boolean" value="true" />
+    <input name="tint_color" type="color3" value="0.95,0.5,0.5" />
+  </legacy_mirror>
+  <surfacematerial name="M_legacy_mirror" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_mirror" />
+  </surfacematerial>
+
+  <legacy_plastic name="SR_legacy_plastic" type="surfaceshader" >
+    <input name="type" type="float" value="1" />
+    <input name="color" type="color3" value="0.43,0.07,0.07" />
+    <input name="finish" type="float"/>
+    <input name="tint_enable" type="boolean"/>
+    <input name="tint_color" type="color3"/>
+    <input name="finish_bump_enable" type="boolean" />
+    <input name="finish_bump" type="vector3" nodename="height_map1_plastic" />
+    <input name="relief_pattern_enable" type="boolean" />
+    <input name="relief_pattern" type="vector3" nodename="height_map2_plastic"/>
+  </legacy_plastic>
+  <surfacematerial name="M_legacy_plastic" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_plastic" />
+  </surfacematerial>
+  <adsk:height_map name="height_map1_plastic" type="vector3" version="1.0.1" xpos="9.405797" ypos="0.146552">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_travertine_versailles_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="height_map2_plastic" type="vector3" version="1.0.1" xpos="9.362319" ypos="2.620690">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_mix01_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_hardwood name="SR_legacy_hardwood" type="surfaceshader" >
+    <input name="color" type="color3" nodename="image_hardwood" />
+    <input name="stain_enable" type="boolean" value="true" />
+    <input name="stain_color" type="color3" value="0.2,0.2,0.9" />
+    <input name="finish" type="float" />
+    <input name="used_for" type="float" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="relief_pattern_enable" type="boolean" />
+    <input name="relief_pattern_type" type="float" />
+    <input name="relief_pattern_custom" type="vector3" nodename="height_map1_hardwood" />
+  </legacy_hardwood>
+  <surfacematerial name="M_legacy_hardwood" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_hardwood" />
+  </surfacematerial>
+  <image name="image_hardwood" type="color3" nodedef="ND_image_color3" xpos="-746.5" ypos="-551">
+    <input name="file" type="filename" uniform="true" value="textures/Woods - Plastics.Finish Carpentry.Wood.Red Birch.jpg" uivisible="true" />
+  </image>
+  <adsk:height_map name="height_map1_hardwood" type="vector3" version="1.0.1" xpos="7.739130" ypos="0.818965">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_travertine_versailles_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_glazing name="SR_legacy_glazing" type="surfaceshader" >
+    <input name="color" type="float" value="6" />
+    <input name="custom_color" type="color3" value="0.99,0,0" />
+    <input name="test_sRGB" type="boolean"/>
+    <input name="reflectance" type="float"/>
+    <input name="reflection_color" type="float"/>
+    <input name="sheets_of_glass" type="integer"/>
+    <input name="tint_enable" type="boolean"/>
+    <input name="tint_color" type="color3"/>
+  </legacy_glazing>
+  <surfacematerial name="M_legacy_glazing" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_glazing" />
+  </surfacematerial>
+
+  <legacy_metal name="SR_legacy_metal" type="surfaceshader" >
+    <input name="type" type="float" value="3" />
+    <input name="custom_color" type="color3"/>
+    <input name="finish" type="float" value="1" />
+    <input name="custom_finish" type="float"/>
+    <input name="patina" type="float" value="0.5" />
+    <input name="relief_enable" type="boolean"/>
+    <input name="relief" type="float"/>
+    <input name="custom_relief" type="vector3"/>
+    <input name="cutout_enable" type="boolean" value="true" />
+    <input name="cutout" type="float" value="4" />
+    <input name="cutout_size" type="float" value="0.06" />
+    <input name="cutout_spacing" type="float" value="0.1" />
+    <input name="custom_cutout" type="color3"/>
+    <input name="tint_enable" type="boolean"/>
+    <input name="tint_color" type="color3"/>
+    <input name="normal_knurl" type="vector3" nodename="normal_map_knurl" />
+    <input name="normal_diamondplate" type="vector3" nodename="normal_map_diamondplate" />
+    <input name="normal_checkerplate" type="vector3" nodename="normal_map_checkerplate" />
+  </legacy_metal>
+  <surfacematerial name="M_legacy_metal" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_metal" />
+  </surfacematerial>
+  <adsk:normal_map name="normal_map_knurl" type="vector3" nodedef="adsk:ND_adsk_normal_map" version="1.0.1" xpos="-687.5" ypos="-264">
+    <input name="file" type="filename" uniform="true" value="textures/texture_knurl_norm.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+  <adsk:normal_map name="normal_map_diamondplate" type="vector3" nodedef="adsk:ND_adsk_normal_map" version="1.0.1" xpos="-695.5" ypos="118">
+    <input name="file" type="filename" uniform="true" value="textures/texture_diamond_plate_1_norm.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+  <adsk:normal_map name="normal_map_checkerplate" type="vector3" nodedef="adsk:ND_adsk_normal_map" version="1.0.1" xpos="-696.5" ypos="489">
+    <input name="file" type="filename" uniform="true" value="textures/texture_diamond_plate_3_norm.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+
+  <legacy_metallicpaint name="SR_legacy_metallicpaint" type="surfaceshader" >
+    <input name="color" type="color3" />
+    <input name="highlight_spread" type="float" />
+    <input name="coat_type" type="float" />
+    <input name="coat_finish" type="float" />
+    <input name="custom_coat_ior" type="float" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+  </legacy_metallicpaint>
+  <surfacematerial name="M_legacy_metallicpaint" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_metallicpaint" />
+  </surfacematerial>
+
+  <legacy_concrete name="SR_legacy_concrete" type="surfaceshader" >
+    <input name="color" type="color3"/>
+    <input name="sealant" type="float"/>
+    <input name="finish_bump" type="float"/>
+    <input name="tint_enable" type="boolean" value="true" />
+    <input name="tint_color" type="color3" value="0.5,0.5,0.95" />
+    <input name="bump_broomstraight" type="vector3" nodename="texture_broomstraight"/>
+    <input name="bump_broomcurved" type="vector3" nodename="texture_broomcurved"/>
+    <input name="bump_smooth" type="vector3" nodename="texture_smooth"/>
+    <input name="bump_polished" type="vector3" nodename="texture_polished"/>
+    <input name="bump_custom" type="vector3" nodename="texture_custom"/>
+    <input name="weathering_enable" type="boolean" />
+    <input name="weathering_type" type="float" />
+    <input name="weathering_custom" type="color3" nodename="image_color3" />
+    <input name="weathering_bump" type="color3" nodename="image_color4" />
+  </legacy_concrete>
+  <surfacematerial name="M_legacy_concrete" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_concrete" />
+  </surfacematerial>
+  <adsk:height_map name="texture_broomstraight" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-1554.5" ypos="-547">
+    <input name="file" type="filename" uniform="true" value="textures/Simple_Concrete_Mtl_BroomStraight_pattern.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="texture_broomcurved" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-1560.5" ypos="-164">
+    <input name="file" type="filename" uniform="true" value="textures/Simple_Concrete_Mtl_BroomCurved_pattern.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="texture_smooth" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-1547.5" ypos="198">
+    <input name="file" type="filename" uniform="true" value="textures/polished_concrete_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="texture_custom" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-1556.15" ypos="979.926">
+    <input name="file" type="filename" uniform="true" value="textures/brick_soldier_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" nodename="constant" />
+  </adsk:height_map>
+  <constant name="constant" type="float" nodedef="ND_constant_float" xpos="-1915.88" ypos="1007.74">
+    <input name="value" type="float" value="0.5" />
+  </constant>
+  <adsk:height_map name="texture_polished" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-1554.5" ypos="587.103">
+    <input name="file" type="filename" uniform="true" value="textures/polished_concrete_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="0.1" />
+  </adsk:height_map>
+  <image name="image_color3" type="color3" xpos="8.550725" ypos="3.922414">
+    <input name="file" type="filename" value="textures/Plane001HeightMap.png" />
+  </image>
+  <image name="image_color4" type="color3" xpos="8.557971" ypos="7.370690">
+    <input name="file" type="filename" value="textures/brick_soldier_bump.jpg" />
+  </image>
+
+  <legacy_wallpaint name="SR_legacy_wallpaint" type="surfaceshader" >
+    <input name="color" type="color3" />
+    <input name="finish" type="float" />
+    <input name="application" type="float" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="normal_roller" type="vector3" nodename="roller_map" />
+    <input name="normal_brush" type="vector3" nodename="brush_map" />
+    <input name="normal_spray" type="vector3" nodename="spray_map" />
+  </legacy_wallpaint>
+  <surfacematerial name="M_legacy_wallpaint" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_wallpaint" />
+  </surfacematerial>
+  <multiply name="test_uv_mult" type="vector2" nodedef="ND_multiply_vector2FA" xpos="-852.5" ypos="-221">
+    <input name="in1" type="vector2" value="1, 1" />
+    <input name="in2" type="float" value="10" />
+  </multiply>
+  <adsk:height_map name="brush_map" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-477.5" ypos="-124">
+    <input name="file" type="filename" uniform="true" value="textures/brush.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="uv_scale" type="vector2" nodename="test_uv_mult" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="roller_map" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-473.5" ypos="-493">
+    <input name="file" type="filename" uniform="true" value="textures/roller.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="uv_scale" type="vector2" nodename="test_uv_mult" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="spray_map" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-480.5" ypos="232">
+    <input name="file" type="filename" uniform="true" value="textures/spray.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="uv_scale" type="vector2" nodename="test_uv_mult" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_ceramic name="SR_legacy_ceramic" type="surfaceshader" >
+    <input name="color" type="color3" value="0.75,0.55,0.65"/>
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="type" type="float" />
+    <input name="finish" type="float" />
+    <input name="finish_bump_enable" type="boolean" />
+    <input name="finish_bump" type="float" />
+    <input name="custom_finish_normal" type="vector3" nodename="height_map3_ceramic" />
+    <input name="relief_pattern_enable" type="boolean" />
+    <input name="relief_pattern_normal" type="vector3" nodename="height_map1_ceramic" />
+    <output name="out" type="surfaceshader" />
+  </legacy_ceramic>
+  <surfacematerial name="M_legacy_ceramic" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_ceramic" />
+  </surfacematerial>
+  <adsk:height_map name="height_map1_ceramic" type="vector3" version="1.0.1" xpos="9.405797" ypos="0.146552">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_travertine_versailles_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="height_map3_ceramic" type="vector3" version="1.0.1" xpos="9.405797" ypos="-1.396552">
+    <input name="file" type="filename" uniform="true" value="textures/Plane001HeightMap.png" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_glass name="SR_legacy_glass" type="surfaceshader" >
+    <input name="color" type="float" value="6" />
+    <input name="custom_color" type="color3" value="0.0,0.99,0.0" />
+    <input name="test_sRGB" type="boolean" value="true" />
+    <input name="reflectance" type="float" />
+    <input name="refraction_ior" type="float" value="2" />
+    <input name="custom_ior" type="float" />
+    <input name="roughness" type="float" value="0.1" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="relief_enable" type="boolean" value="true" />
+    <input name="relief_type" type="float" value="1" />
+    <input name="normal_rippled" type="vector3" nodename="normal_map_rippled" />
+    <input name="normal_wavy" type="vector3" nodename="normal_map_wavy" />
+    <input name="custom_relief" type="vector3" nodename="normal_map_custom" />
+  </legacy_glass>
+  <surfacematerial name="M_legacy_glass" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_glass" />
+  </surfacematerial>
+  <adsk:normal_map name="normal_map_rippled" type="vector3" version="1.0.1" xpos="8.173913" ypos="-0.008621">
+    <input name="file" type="filename" uniform="true" value="textures/texture_glass_clouds_norm.png" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+  <adsk:normal_map name="normal_map_wavy" type="vector3" version="1.0.1" xpos="8.202899" ypos="1.922414">
+    <input name="file" type="filename" uniform="true" value="textures/texture_glass_noise_norm.png" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+  <adsk:normal_map name="normal_map_custom" type="vector3" version="1.0.1" xpos="8.217391" ypos="3.594828">
+    <input name="file" type="filename" uniform="true" value="textures/texture_glass_mosaic_norm.png" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+  </adsk:normal_map>
+
+  <legacy_water name="SR_legacy_water" type="surfaceshader" >
+    <input name="type" type="float" value="2" />
+    <input name="test_sRGB" type="boolean" />
+    <input name="secondary_color" type="float" value="7" />
+    <input name="custom_color" type="color3" value="0,0,1" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="bump_swimming_pool" type="vector3" nodename="height_map1_water"/>
+    <input name="bump_generic_refl_pool" type="vector3" nodename="height_map_water"/>
+    <input name="bump_generic_stream" type="vector3" nodename="height_map1_water"/>
+    <input name="bump_generic_pond" type="vector3" nodename="height_map_water"/>
+    <input name="bump_generic_sea" type="vector3" nodename="height_map2_water"/>
+  </legacy_water>
+  <surfacematerial name="M_legacy_water" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_water" />
+  </surfacematerial>
+  <adsk:height_map name="height_map_water" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-694.5" ypos="-435">
+    <input name="file" type="filename" uniform="true" value="textures/water_calm.png" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="height_map1_water" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-694.5" ypos="-68">
+    <input name="file" type="filename" uniform="true" value="textures/water_swimmingpool_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="height_map2_water" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-700.5" ypos="295">
+    <input name="file" type="filename" uniform="true" value="textures/water_seacalm_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_stone name="SR_legacy_stone" type="surfaceshader" >
+    <input name="color" type="color3" />
+    <input name="finish" type="float" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="finish_bump_enable" type="boolean" value="true" />
+    <input name="finish_bump" type="float" />
+    <input name="finish_granite" type="vector3" nodename="test_granite_bump" />
+    <input name="finish_marble" type="vector3" nodename="test_marble_bump" />
+    <input name="finish_wall" type="vector3" nodename="test_stonewall_bump" />
+    <input name="custom_finish" type="vector3" nodename="height_map1_stone"/>
+    <input name="relief_pattern_enable" type="boolean" />
+    <input name="relief_pattern" type="vector3" nodename="height_map2_stone" />
+  </legacy_stone>
+  <surfacematerial name="M_legacy_stone" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_stone" />
+  </surfacematerial>
+  <adsk:height_map name="test_granite_bump" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-635.5" ypos="-281">
+    <input name="file" type="filename" uniform="true" value="textures/Simple_Stone_Mtl_Granite_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" nodename="test_depth" />
+  </adsk:height_map>
+  <adsk:height_map name="test_marble_bump" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-638" ypos="92">
+    <input name="file" type="filename" uniform="true" value="textures/Simple_Stone_Mtl_Marble_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" nodename="test_depth" />
+  </adsk:height_map>
+  <adsk:height_map name="test_stonewall_bump" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-639.5" ypos="460">
+    <input name="file" type="filename" uniform="true" value="textures/Simple_Stone_Mtl_StoneWall_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" nodename="test_depth" />
+  </adsk:height_map>
+  <constant name="test_depth" type="float" nodedef="ND_constant_float" xpos="-1102.5" ypos="-410">
+    <input name="value" type="float" value="0.5" />
+  </constant>
+  <adsk:height_map name="height_map1_stone" type="vector3" version="1.0.1" xpos="10.333333" ypos="5.094828">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_travertine_versailles_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+  <adsk:height_map name="height_map2_stone" type="vector3" version="1.0.1" xpos="10.289855" ypos="6.663793">
+    <input name="file" type="filename" uniform="true" value="textures/tiles_mix01_bump.jpg" fileprefix="" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_masonry name="SR_legacy_masonry" type="surfaceshader" >
+    <input name="type" type="float" />
+    <input name="color" type="color3" />
+    <input name="tint_enable" type="boolean" />
+    <input name="tint_color" type="color3" />
+    <input name="finish" type="float" />
+    <input name="relief_enable" type="boolean" value="true" />
+    <input name="relief_image" type="vector3" nodename="test_bump_masonry" />
+  </legacy_masonry>
+  <surfacematerial name="M_legacy_masonry" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_masonry" />
+  </surfacematerial>
+  <adsk:height_map name="test_bump_masonry" type="vector3" nodedef="adsk:ND_adsk_height_map" version="1.0.1" xpos="-592.5" ypos="-323.118">
+    <input name="file" type="filename" uniform="true" value="textures/brick_bump.jpg" />
+    <input name="realworld_scale" type="vector2" value="1, 1" />
+    <input name="depth" type="float" value="1" />
+  </adsk:height_map>
+
+  <legacy_generic name="SR_legacy_generic" type="surfaceshader" >
+    <input name="diffuse_color" type="color3"/>
+    <input name="diffuse_image_enable" type="boolean"/>
+    <input name="diffuse_image" type="color3"/>
+    <input name="diffuse_image_fade" type="float"/>
+    <input name="tint_enable" type="boolean"/>
+    <input name="tint_color" type="color3"/>
+    <input name="glossiness" type="float"/>
+    <input name="metallic_highlights" type="boolean"/>
+    <input name="reflectivity_enable" type="boolean"/>
+    <input name="reflectivity" type="float"/>
+    <input name="transparency_enable" type="boolean"/>
+    <input name="transparency_amount" type="float"/>
+    <input name="transparency_image_enable" type="boolean"/>
+    <input name="transparency_image" type="float" nodename="test_transparency"/>
+    <input name="transparency_image_fade" type="float"/>
+    <input name="refraction" type="float" />
+    <input name="custom_refraction" type="float"/>
+    <input name="translucency" type="float" />
+    <input name="bump_enable" type="boolean" />
+    <input name="bump" type="vector3" />
+    <input name="cutout_enable" type="boolean"/>
+    <input name="cutout_image" type="color3" nodename="test_cutout"/>
+    <input name="emission_enable" type="boolean"/>
+    <input name="emission_color" type="color3"/>
+    <input name="luminance" type="float"/>
+    <input name="custom_luminance" type="float"/>
+    <input name="color_temperature" type="float"/>
+    <input name="custom_color_temperature" type="float"/>
+  </legacy_generic>
+  <surfacematerial name="M_legacy_generic" type="material">
+    <input name="surfaceshader" type="surfaceshader" nodename="SR_legacy_generic" />
+  </surfacematerial>
+  <image name="test_transparency" type="float" nodedef="ND_image_float" xpos="-481.5" ypos="43">
+    <input name="file" type="filename" uniform="true" value="textures/leather_perforated_cutout.png" />
+  </image>
+  <image name="test_cutout" type="color3" nodedef="ND_image_color3" xpos="-477.5" ypos="479">
+    <input name="file" type="filename" uniform="true" value="textures/SiteWork.Planting.Basket.Woven.Loose.Mask.jpg" />
+  </image>
+
+</materialx>
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Plane001HeightMap.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Plane001HeightMap.png
new file mode 100644
index 0000000000..4a883b6007
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Plane001HeightMap.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomCurved_pattern.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomCurved_pattern.jpg
new file mode 100644
index 0000000000..ed984c7fb0
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomCurved_pattern.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomStraight_pattern.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomStraight_pattern.jpg
new file mode 100644
index 0000000000..0cfd531ce6
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Concrete_Mtl_BroomStraight_pattern.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Granite_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Granite_bump.jpg
new file mode 100644
index 0000000000..0e26b68f5f
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Granite_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Marble_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Marble_bump.jpg
new file mode 100644
index 0000000000..bf1a243aa9
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_Marble_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_StoneWall_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_StoneWall_bump.jpg
new file mode 100644
index 0000000000..8c2baf36ce
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Simple_Stone_Mtl_StoneWall_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/SiteWork.Planting.Basket.Woven.Loose.Mask.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/SiteWork.Planting.Basket.Woven.Loose.Mask.jpg
new file mode 100644
index 0000000000..153ebf69fd
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/SiteWork.Planting.Basket.Woven.Loose.Mask.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Woods - Plastics.Finish Carpentry.Wood.Red Birch.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Woods - Plastics.Finish Carpentry.Wood.Red Birch.jpg
new file mode 100644
index 0000000000..220c220992
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/Woods - Plastics.Finish Carpentry.Wood.Red Birch.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_bump.jpg
new file mode 100644
index 0000000000..b9c7683bfb
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_soldier_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_soldier_bump.jpg
new file mode 100644
index 0000000000..352cc52db1
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brick_soldier_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brush.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brush.png
new file mode 100644
index 0000000000..72ffc76012
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/brush.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/leather_perforated_cutout.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/leather_perforated_cutout.png
new file mode 100644
index 0000000000..1e615f5a99
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/leather_perforated_cutout.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/polished_concrete_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/polished_concrete_bump.jpg
new file mode 100644
index 0000000000..a184cba156
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/polished_concrete_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/roller.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/roller.png
new file mode 100644
index 0000000000..2348f272fa
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/roller.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/spray.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/spray.png
new file mode 100644
index 0000000000..454f0ba060
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/spray.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_1_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_1_norm.png
new file mode 100644
index 0000000000..27388258ae
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_1_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_3_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_3_norm.png
new file mode 100644
index 0000000000..f19696924a
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_diamond_plate_3_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_clouds_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_clouds_norm.png
new file mode 100644
index 0000000000..18fbc89b8a
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_clouds_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_mosaic_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_mosaic_norm.png
new file mode 100644
index 0000000000..c980b7dcd1
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_mosaic_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_noise_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_noise_norm.png
new file mode 100644
index 0000000000..f4736013e7
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_glass_noise_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_knurl_norm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_knurl_norm.png
new file mode 100644
index 0000000000..2e801d52b8
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_knurl_norm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_orangepeel_height.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_orangepeel_height.png
new file mode 100644
index 0000000000..a4ba38ba79
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/texture_orangepeel_height.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_mix01_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_mix01_bump.jpg
new file mode 100644
index 0000000000..2c76c64bcf
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_mix01_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_travertine_versailles_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_travertine_versailles_bump.jpg
new file mode 100644
index 0000000000..a6a0b986ae
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/tiles_travertine_versailles_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_calm.png b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_calm.png
new file mode 100644
index 0000000000..7716ac49e4
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_calm.png differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_seacalm_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_seacalm_bump.jpg
new file mode 100644
index 0000000000..61654c93d5
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_seacalm_bump.jpg differ
diff --git a/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_swimmingpool_bump.jpg b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_swimmingpool_bump.jpg
new file mode 100644
index 0000000000..9d74bb45fc
Binary files /dev/null and b/contrib/adsk/resources/Materials/TestSuite/adsklib/legacy/textures/water_swimmingpool_bump.jpg differ