diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab
index c9f6e8884..72718ebac 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab
@@ -90,7 +90,10 @@
                 },
                 "Component_[2635600976954600347]": {
                     "$type": "EditorEntitySortComponent",
-                    "Id": 2635600976954600347
+                    "Id": 2635600976954600347,
+                    "Child Entity Order": [
+                        "Entity_[99283788693054]"
+                    ]
                 },
                 "Component_[3144205669266579244]": {
                     "$type": "EditorMaterialComponent",
@@ -125,7 +128,7 @@
                                     "guid": "{8A03C41F-AC4F-5852-8AA7-0A4EFA5E2D61}",
                                     "subId": 282632013
                                 },
-                                "assetHint": "assets/warehouse/models/box1.azmodel"
+                                "assetHint": "assets/warehouse/models/box1.fbx.azmodel"
                             }
                         }
                     }
@@ -143,6 +146,106 @@
                     "Id": 9483887954899180333
                 }
             }
+        },
+        "Entity_[99283788693054]": {
+            "Id": "Entity_[99283788693054]",
+            "Name": "Info",
+            "Components": {
+                "EditorBoxShapeComponent": {
+                    "$type": "EditorBoxShapeComponent",
+                    "Id": 17124401086820924525,
+                    "BoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                1.0,
+                                0.5520851612091064,
+                                0.6901825070381165
+                            ],
+                            "TranslationOffset": [
+                                0.0,
+                                -0.004386529326438904,
+                                0.36366888880729675
+                            ]
+                        }
+                    }
+                },
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 6272377573003502024
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 4261736700808391015
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 15767446823377832091
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14007944666053167241
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 3375540018670479054
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5807592450680506754
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 15258727986761393057
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 7316926263509782690
+                },
+                "PrefabInfoEditorComponent": {
+                    "$type": "PrefabInfoEditorComponent",
+                    "Id": 15816956265793812424,
+                    "Name": "WarehouseBox1",
+                    "Description": "A typical tall box.",
+                    "Aabb": {
+                        "min": [
+                            -0.5,
+                            -0.2804291248321533,
+                            0.01857757568359375
+                        ],
+                        "max": [
+                            0.5,
+                            0.2716560363769531,
+                            0.7087602615356445
+                        ]
+                    },
+                    "AnchorTransform": {
+                        "Translation": [
+                            0.0,
+                            0.0,
+                            0.040079593658447266
+                        ],
+                        "Rotation": [
+                            0.0,
+                            0.0,
+                            0.0,
+                            1.0
+                        ],
+                        "Scale": 1.0
+                    }
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 9507527646945833234,
+                    "Parent Entity": "Entity_[5641038461374]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            0.040079593658447266
+                        ]
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_2x2_Pack1.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_2x2_Pack1.prefab
index 025086215..920c70454 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_2x2_Pack1.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_2x2_Pack1.prefab
@@ -30,7 +30,8 @@
                     "Instance_[5772913519499]/ContainerEntity",
                     "Instance_[7379231288203]/ContainerEntity",
                     "Instance_[8109375728523]/ContainerEntity",
-                    "Instance_[8856700038027]/ContainerEntity"
+                    "Instance_[8856700038027]/ContainerEntity",
+                    "Entity_[6714358562366]"
                 ]
             },
             "Component_[2784794729749106706]": {
@@ -52,6 +53,88 @@
             }
         }
     },
+    "Entities": {
+        "Entity_[6714358562366]": {
+            "Id": "Entity_[6714358562366]",
+            "Name": "Info",
+            "Components": {
+                "EditorAxisAlignedBoxShapeComponent": {
+                    "$type": "EditorAxisAlignedBoxShapeComponent",
+                    "Id": 11801499337565818917,
+                    "AxisAlignedBoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                6.229617595672607,
+                                2.2291085720062256,
+                                5.021814346313477
+                            ],
+                            "TranslationOffset": [
+                                -0.011689066886901855,
+                                -0.0007860362529754639,
+                                2.433511734008789
+                            ]
+                        }
+                    }
+                },
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 16038002308475242159
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 2903980904705614601
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 10706818838127602869
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 6363443971184248669
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2108874714725423346
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 15677118444341077872
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 4274404753870429390
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 387498196156717388
+                },
+                "PrefabInfoEditorComponent": {
+                    "$type": "PrefabInfoEditorComponent",
+                    "Id": 2740870588527682977,
+                    "Name": "Storage_2x2_Pack1",
+                    "Description": "Rack with boxes accessible from longer side of the rack. Racks should be put at least 1 m apart along x axis and 2 m apart along y axis.",
+                    "AnchorTransformEntityId": "",
+                    "Aabb": {
+                        "min": [
+                            -3.126497268676758,
+                            -1.115340232849121,
+                            -0.07739543914794922
+                        ],
+                        "max": [
+                            3.1031198501586914,
+                            1.1137681007385254,
+                            4.944418907165527
+                        ]
+                    }
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 3382247387917640991,
+                    "Parent Entity": "ContainerEntity"
+                }
+            }
+        }
+    },
     "Instances": {
         "Instance_[5772913519499]": {
             "Source": "Prefabs/Warehouse_storage/Storage_rack1.prefab",
@@ -281,14 +364,6 @@
                     "op": "remove",
                     "path": "/Entities/Entity_[72079887563198]/Components/Component_[4058468385591425268]/Child Entity Order/10"
                 },
-                {
-                    "op": "remove",
-                    "path": "/Entities/Entity_[72084182530494]/Components/Component_[3937996073827386159]/Child Entity Order/3"
-                },
-                {
-                    "op": "remove",
-                    "path": "/Entities/Entity_[72084182530494]/Components/Component_[3937996073827386159]/Child Entity Order/2"
-                },
                 {
                     "op": "replace",
                     "path": "/Entities/Entity_[72088477497790]/Components/Component_[4058468385591425268]/Child Entity Order/0",
@@ -503,6 +578,20 @@
                 {
                     "op": "remove",
                     "path": "/Entities/Entity_[72092772465086]/Components/Component_[4058468385591425268]/Child Entity Order/9"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[71491477043646]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Asset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[71491477043646]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Configuration/PhysicsAsset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "remove",
+                    "path": "/Entities/Entity_[72084182530494]/Components/PrefabInfoEditorComponent"
                 }
             ]
         },
@@ -737,6 +826,16 @@
                 {
                     "op": "remove",
                     "path": "/Entities/Entity_[367745436219838]/Components/Component_[3937996073827386159]/Child Entity Order/2"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[260027656436158]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Asset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[260027656436158]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Configuration/PhysicsAsset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                 }
             ]
         },
@@ -906,6 +1005,16 @@
                 {
                     "op": "remove",
                     "path": "/Entities/Entity_[147893677174521]/Components/Component_[3937996073827386159]/Child Entity Order/2"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[10209910566649]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Asset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[10209910566649]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Configuration/PhysicsAsset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                 }
             ]
         },
@@ -1003,6 +1112,16 @@
                     "op": "add",
                     "path": "/Entities/Entity_[339389089033977]/Components/Component_[4058468385591425268]/Child Entity Order/10",
                     "value": "Instance_[246046564790009]/ContainerEntity"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[5907326433726]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Asset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Instances/Instance_[5907326433726]/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Configuration/PhysicsAsset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                 }
             ]
         }
diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab
index 980be49f1..346283fc1 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab
@@ -261,7 +261,8 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 5269735565457263604,
                     "Child Entity Order": [
-                        "Entity_[41557998601191]"
+                        "Entity_[41557998601191]",
+                        "Entity_[98858586930750]"
                     ]
                 },
                 "Component_[5324226478596329467]": {
@@ -347,6 +348,85 @@
                     }
                 }
             }
+        },
+        "Entity_[98858586930750]": {
+            "Id": "Entity_[98858586930750]",
+            "Name": "info",
+            "Components": {
+                "EditorAxisAlignedBoxShapeComponent": {
+                    "$type": "EditorAxisAlignedBoxShapeComponent",
+                    "Id": 13534206884689048877,
+                    "AxisAlignedBoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                0.6755567789077759,
+                                1.1369948387145996,
+                                1.9659757614135742
+                            ],
+                            "TranslationOffset": [
+                                0.010600030422210693,
+                                -0.019865840673446655,
+                                0.9851396083831787
+                            ]
+                        }
+                    }
+                },
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 5946807877024758299
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 6538727645410202178
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14692135936681008036
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 4077288369641443053
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 11596032117429885127
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 77603860509724486
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 6915621409598247097
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 14959329508627522608
+                },
+                "PrefabInfoEditorComponent": {
+                    "$type": "PrefabInfoEditorComponent",
+                    "Id": 15945264967506136999,
+                    "Description": "Shelves on wheels. Shelves edges should be put at least 1 m apart along x axis and 0.5 m apart along y axis.",
+                    "AnchorTransformEntityId": "",
+                    "Aabb": {
+                        "min": [
+                            -0.327178955078125,
+                            -0.5883632898330688,
+                            0.0021517276763916016
+                        ],
+                        "max": [
+                            0.34837913513183594,
+                            0.5486316680908203,
+                            1.9681274890899658
+                        ]
+                    }
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 3399769095602196648,
+                    "Parent Entity": "Entity_[58382014962770]"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_rack1.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_rack1.prefab
index 2aacef863..7b9ab77fa 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_rack1.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_rack1.prefab
@@ -237,15 +237,50 @@
                     "Id": 3937996073827386159,
                     "Child Entity Order": [
                         "Entity_[72075592595902]",
-                        "Instance_[71491477043646]/ContainerEntity",
-                        "",
-                        ""
+                        "Instance_[71491477043646]/ContainerEntity"
                     ]
                 },
                 "Component_[6485857306406049964]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 6485857306406049964,
                     "Parent Entity": "ContainerEntity"
+                },
+                "EditorAxisAlignedBoxShapeComponent": {
+                    "$type": "EditorAxisAlignedBoxShapeComponent",
+                    "Id": 11236033466813704039,
+                    "AxisAlignedBoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                1.0,
+                                3.12188458442688,
+                                5.015216827392578
+                            ],
+                            "TranslationOffset": [
+                                0.0,
+                                0.00881725549697876,
+                                2.4837770462036133
+                            ]
+                        }
+                    }
+                },
+                "PrefabInfoEditorComponent": {
+                    "$type": "PrefabInfoEditorComponent",
+                    "Id": 7593083003196012669,
+                    "Name": "Storage_rack1",
+                    "Description": "Small rack with boxes accessible from longer side of the rack. Small racks edges should be put at least 2 m apart along x axis and 1 m apart along y axis.",
+                    "AnchorTransformEntityId": "",
+                    "Aabb": {
+                        "min": [
+                            -0.5,
+                            -1.5521249771118164,
+                            -0.02383136749267578
+                        ],
+                        "max": [
+                            0.5,
+                            1.5697598457336426,
+                            4.991385459899902
+                        ]
+                    }
                 }
             }
         },
@@ -643,7 +678,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[11645621937081874484]/Transform Data/Rotate/2",
-                    "value": 0.9132558107376099
+                    "value": 0.91325581073761
                 }
             ]
         },
@@ -919,6 +954,16 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[15832779900574876777]/Parent Entity",
                     "value": "../Entity_[72084182530494]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Asset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
+                },
+                {
+                    "op": "replace",
+                    "path": "/Entities/Entity_[5559434082750]/Components/Component_[2276504649476859699]/ShapeConfiguration/PhysicsAsset/Configuration/PhysicsAsset/assetHint",
+                    "value": "assets/warehouse/models/warehouse_rack.fbx.pxmesh"
                 }
             ]
         },
diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Floor.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Floor.prefab
index dd5c0ce25..beaa19133 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Floor.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Floor.prefab
@@ -64,7 +64,7 @@
                                     "guid": "{4687EDB6-F57B-592A-8451-4A41BD678D9A}",
                                     "subId": 270838499
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_floor.azmodel"
+                                "assetHint": "assets/warehouse/models/warehouse_floor.fbx.azmodel"
                             }
                         }
                     }
@@ -130,7 +130,7 @@
                                     "guid": "{4687EDB6-F57B-592A-8451-4A41BD678D9A}",
                                     "subId": 2070809848
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_floor.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_floor.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "Scale": [
@@ -144,12 +144,13 @@
                                         "subId": 2070809848
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_floor.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_floor.fbx.pxmesh"
                                 }
                             }
                         },
                         "HasNonUniformScale": true
-                    }
+                    },
+                    "HasNonUniformScale": true
                 },
                 "Component_[17647558825107464022]": {
                     "$type": "EditorVisibilityComponent",
@@ -162,14 +163,7 @@
                 "Component_[4070093678589085014]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 4070093678589085014,
-                    "Parent Entity": "ContainerEntity",
-                    "Transform Data": {
-                        "Translate": [
-                            0.8478307723999023,
-                            0.24125289916992188,
-                            0.0
-                        ]
-                    }
+                    "Parent Entity": "ContainerEntity"
                 },
                 "Component_[5344339738119561654]": {
                     "$type": "EditorStaticRigidBodyComponent",
diff --git a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab
index 1c3d3cf27..797d8ee18 100755
--- a/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab
+++ b/Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab
@@ -231,7 +231,7 @@
                                     "guid": "{9F3790A0-9383-5BBA-BB91-2AD9F04086B3}",
                                     "subId": 675098786
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -240,7 +240,7 @@
                                         "subId": 675098786
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_gate_closed.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_gate_closed.fbx.pxmesh"
                                 }
                             }
                         }
@@ -351,7 +351,7 @@
                                     "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
                                     "subId": 3814177680
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -360,7 +360,7 @@
                                         "subId": 3814177680
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.fbx.pxmesh"
                                 }
                             }
                         }
@@ -478,7 +478,7 @@
                                     "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
                                     "subId": 2510506373
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_front.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -487,7 +487,7 @@
                                         "subId": 2510506373
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_front.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_front.fbx.pxmesh"
                                 }
                             }
                         }
@@ -594,7 +594,7 @@
                                     "guid": "{1DB458F4-42D7-5377-995B-415257F59549}",
                                     "subId": 1364068586
                                 },
-                                "assetHint": "assets/warehouse/models/warehouse_walls_side.pxmesh"
+                                "assetHint": "assets/warehouse/models/warehouse_walls_side.fbx.pxmesh"
                             },
                             "Configuration": {
                                 "PhysicsAsset": {
@@ -603,7 +603,7 @@
                                         "subId": 1364068586
                                     },
                                     "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/warehouse/models/warehouse_walls_side.pxmesh"
+                                    "assetHint": "assets/warehouse/models/warehouse_walls_side.fbx.pxmesh"
                                 }
                             }
                         }
@@ -661,7 +661,8 @@
                     "Child Entity Order": [
                         "Entity_[375984239316036]",
                         "Entity_[368861560381088]",
-                        "Entity_[368865855348384]"
+                        "Entity_[368865855348384]",
+                        "Entity_[99855019343422]"
                     ]
                 },
                 "Component_[17205482816227847850]": {
@@ -736,8 +737,23 @@
                 "Component_[7017245480046407512]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7017245480046407512,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10232715223514738948]": {
+                            "$type": "AZ::Render::EditorMeshComponent",
+                            "Id": 10232715223514738948,
+                            "Controller": {
+                                "Configuration": {
+                                    "ModelAsset": {
+                                        "assetId": {
+                                            "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
+                                            "subId": 269507228
+                                        },
+                                        "assetHint": "assets/warehouse/models/warehouse_walls_front.azmodel"
+                                    }
+                                }
+                            }
+                        },
+                        "Component_[3790789121538053334]": {
                             "$type": "EditorColliderComponent",
                             "Id": 3790789121538053334,
                             "ColliderConfiguration": {
@@ -770,29 +786,14 @@
                                     }
                                 }
                             }
-                        },
-                        {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10232715223514738948,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{995CFC9D-3583-51BC-B46E-4554DEF0650E}",
-                                            "subId": 269507228
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front.azmodel"
-                                    }
-                                }
-                            }
                         }
-                    ]
+                    }
                 },
                 "Component_[8212625672736002681]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8212625672736002681,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[11718397946111790072]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 11718397946111790072,
                             "Controller": {
@@ -815,7 +816,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9253383058600544919]": {
                     "$type": "EditorInspectorComponent",
@@ -872,8 +873,23 @@
                 "Component_[7017245480046407512]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 7017245480046407512,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10232715223514738948]": {
+                            "$type": "AZ::Render::EditorMeshComponent",
+                            "Id": 10232715223514738948,
+                            "Controller": {
+                                "Configuration": {
+                                    "ModelAsset": {
+                                        "assetId": {
+                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
+                                            "subId": 279103289
+                                        },
+                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.azmodel"
+                                    }
+                                }
+                            }
+                        },
+                        "Component_[1554132197757752789]": {
                             "$type": "EditorColliderComponent",
                             "Id": 1554132197757752789,
                             "ColliderConfiguration": {
@@ -906,29 +922,14 @@
                                     }
                                 }
                             }
-                        },
-                        {
-                            "$type": "AZ::Render::EditorMeshComponent",
-                            "Id": 10232715223514738948,
-                            "Controller": {
-                                "Configuration": {
-                                    "ModelAsset": {
-                                        "assetId": {
-                                            "guid": "{34CA9168-D5C7-5554-BE7D-8485A3D67AB6}",
-                                            "subId": 279103289
-                                        },
-                                        "assetHint": "assets/warehouse/models/warehouse_walls_front_gate.azmodel"
-                                    }
-                                }
-                            }
                         }
-                    ]
+                    }
                 },
                 "Component_[8212625672736002681]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8212625672736002681,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[11718397946111790072]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 11718397946111790072,
                             "Controller": {
@@ -951,7 +952,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9253383058600544919]": {
                     "$type": "EditorInspectorComponent",
@@ -978,8 +979,8 @@
                 "Component_[17614188821325671055]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17614188821325671055,
-                    "DisabledComponents": [
-                        {
+                    "DisabledComponents": {
+                        "Component_[10387122939797774050]": {
                             "$type": "AZ::Render::EditorMeshComponent",
                             "Id": 10387122939797774050,
                             "Controller": {
@@ -994,7 +995,7 @@
                                 }
                             }
                         },
-                        {
+                        "Component_[16809483465388003559]": {
                             "$type": "EditorColliderComponent",
                             "Id": 16809483465388003559,
                             "ColliderConfiguration": {
@@ -1031,7 +1032,7 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[17714278481541526192]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
@@ -1070,8 +1071,8 @@
                 "Component_[8806906810237163444]": {
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 8806906810237163444,
-                    "PendingComponents": [
-                        {
+                    "PendingComponents": {
+                        "Component_[12188643545659218893]": {
                             "$type": "EditorMaterialComponent",
                             "Id": 12188643545659218893,
                             "Controller": {
@@ -1107,13 +1108,95 @@
                                 }
                             }
                         }
-                    ]
+                    }
                 },
                 "Component_[9994022325695796853]": {
                     "$type": "EditorStaticRigidBodyComponent",
                     "Id": 9994022325695796853
                 }
             }
+        },
+        "Entity_[99855019343422]": {
+            "Id": "Entity_[99855019343422]",
+            "Name": "info",
+            "Components": {
+                "EditorAxisAlignedBoxShapeComponent": {
+                    "$type": "EditorAxisAlignedBoxShapeComponent",
+                    "Id": 9552059018071887758,
+                    "AxisAlignedBoxShape": {
+                        "Configuration": {
+                            "Dimensions": [
+                                60.0,
+                                20.0,
+                                1.0
+                            ]
+                        }
+                    }
+                },
+                "EditorDisabledCompositionComponent": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 15989221613808373053
+                },
+                "EditorEntityIconComponent": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 12972273420893542712
+                },
+                "EditorEntitySortComponent": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 8500856477448615692
+                },
+                "EditorInspectorComponent": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 8187296386837314443
+                },
+                "EditorLockComponent": {
+                    "$type": "EditorLockComponent",
+                    "Id": 11656995315643571053
+                },
+                "EditorOnlyEntityComponent": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 12722489975810269578
+                },
+                "EditorPendingCompositionComponent": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 17741911267364271836
+                },
+                "EditorVisibilityComponent": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 8809528571083753818
+                },
+                "PrefabInfoEditorComponent": {
+                    "$type": "PrefabInfoEditorComponent",
+                    "Id": 8504810166327193346,
+                    "Name": "Warehouse_Walls",
+                    "Description": "Warehouse walls. Warehouse walls should be put directly over Warehouse_Floor. They have an entrance on the right (max x). Always put at spawning_point. Longer wall is along x axis.",
+                    "AnchorTransformEntityId": "",
+                    "Aabb": {
+                        "min": [
+                            -29.999998092651367,
+                            -10.0,
+                            -0.5
+                        ],
+                        "max": [
+                            30.0,
+                            10.0,
+                            0.5
+                        ]
+                    }
+                },
+                "TransformComponent": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 11715407784859113314,
+                    "Parent Entity": "Entity_[375988534283332]",
+                    "Transform Data": {
+                        "Translate": [
+                            20.73409080505371,
+                            0.6402702331542969,
+                            0.0
+                        ]
+                    }
+                }
+            }
         }
     }
 }
\ No newline at end of file