diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index ebc5ef2f6c..2c6cf7d620 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -400,7 +400,7 @@ void Avatar::relayJointDataToChildren() {
                         }
                     }
 
-                    modelEntity->setOverrideTransform(_skeletonModel->getTransform());
+                    modelEntity->setOverrideTransform(_skeletonModel->getTransform(), _skeletonModel->getOffset());
                     modelEntity->simulateRelayedJoints();
                 }
             }
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 85dbc2feee..3f5453ff04 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -862,10 +862,10 @@ glm::vec3 RenderableModelEntityItem::getLocalJointTranslation(int index) const {
     return glm::vec3();
 }
 
-void RenderableModelEntityItem::setOverrideTransform(const Transform& transform) {
+void RenderableModelEntityItem::setOverrideTransform(const Transform& transform, const glm::vec3& offset) {
     auto model = getModel();
     if (model) {
-        model->overrideModelTransform(transform);
+        model->overrideModelTransform(transform, offset);
     }
 }
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index e9e7b9ba67..1d00767030 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -87,7 +87,7 @@ public:
     bool getJointMapCompleted();
     void setJointMap(std::vector<int> jointMap);
     int avatarJointIndex(int modelJointIndex);
-    void setOverrideTransform(const Transform& transform);
+    void setOverrideTransform(const Transform& transform, const glm::vec3& offset);
 
     // these are in the frame of this object (model space)
     virtual glm::quat getAbsoluteJointRotationInObjectFrame(int index) const override;
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 66ac7ecf6c..8d823049df 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -203,6 +203,7 @@ enum class EntityVersion : PacketVersion {
     StaticCertJsonVersionOne,
     OwnershipChallengeFix,
     ZoneLightInheritModes,
+    ZoneStageRemoved,
     SoftEntities
 };
 
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 0c6c2223cd..874fd09a79 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -1369,10 +1369,11 @@ void Model::deleteGeometry() {
     _collisionGeometry.reset();
 }
 
-void Model::overrideModelTransform(const Transform& transform) {
+void Model::overrideModelTransform(const Transform& transform, const glm::vec3& offset) {
     _overrideTranslation = transform.getTranslation();
     _overrideRotation = transform.getRotation();
     _overrideModelTransform = true;
+    setOffset(offset);
 }
 
 AABox Model::getRenderableMeshBound() const {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index f75e6d9c90..554d3a4f47 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -208,7 +208,7 @@ public:
 
     void setTranslation(const glm::vec3& translation);
     void setRotation(const glm::quat& rotation);
-    void overrideModelTransform(const Transform& transform);
+    void overrideModelTransform(const Transform& transform, const glm::vec3& offset);
     void setOverrideTransform(bool override) { _overrideModelTransform = override; };
     void setTransformNoUpdateRenderItems(const Transform& transform); // temporary HACK
 
diff --git a/scripts/developer/tests/avatarAttachmentTest.js b/scripts/developer/tests/avatarAttachmentTest.js
index c9f2e1615b..ecc8c5a0af 100644
--- a/scripts/developer/tests/avatarAttachmentTest.js
+++ b/scripts/developer/tests/avatarAttachmentTest.js
@@ -57,7 +57,7 @@ ToggleButtonBuddy.prototype.addToggleHandler = function (callback) {
 };
 ToggleButtonBuddy.prototype.removeToggleHandler = function (callback) {
     var index = this.callbacks.indexOf(callback);
-    if (index != -1) {
+    if (index !== -1) {
         this.callbacks.splice(index, 1);
     }
 };
@@ -86,13 +86,23 @@ var coatButton = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_
     down: "https://s3.amazonaws.com/hifi-public/tony/icons/coat-down.svg"
 });
 
+buttonPositionY += BUTTON_HEIGHT + BUTTON_PADDING;
+var coatButton2 = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_WIDTH, BUTTON_HEIGHT, {
+    up: "https://s3.amazonaws.com/hifi-public/tony/icons/coat-up.svg",
+    down: "https://s3.amazonaws.com/hifi-public/tony/icons/coat-down.svg"
+});
+
+var AVATAR_ATTACHMENT = 0;
+var AVATAR_SOFT_ATTACHMENT = 1;
+var ENTITY_ATTACHMENT = 2;
+
 var HAT_ATTACHMENT = {
     modelURL: "https://s3.amazonaws.com/hifi-public/tony/cowboy-hat.fbx",
     jointName: "Head",
     translation: {"x": 0, "y": 0.25, "z": 0.03},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
     scale: 0.052,
-    isSoft: false
+    type: AVATAR_ATTACHMENT
 };
 
 var COAT_ATTACHMENT = {
@@ -101,7 +111,16 @@ var COAT_ATTACHMENT = {
     translation: {"x": 0, "y": 0, "z": 0},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
     scale: 1,
-    isSoft: true
+    type: AVATAR_SOFT_ATTACHMENT
+};
+
+var COAT_ENTITY_ATTACHMENT = {
+    modelURL: "https://hifi-content.s3.amazonaws.com/ozan/dev/clothes/coat/coat_rig.fbx",
+    jointName: "Hips",
+    translation: {"x": 0, "y": 0, "z": 0},
+    rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
+    scale: 1,
+    type: ENTITY_ATTACHMENT
 };
 
 hatButton.addToggleHandler(function (isDown) {
@@ -120,28 +139,54 @@ coatButton.addToggleHandler(function (isDown) {
     }
 });
 
+coatButton2.addToggleHandler(function (isDown) {
+    if (isDown) {
+        wearAttachment(COAT_ENTITY_ATTACHMENT);
+    } else {
+        removeAttachment(COAT_ENTITY_ATTACHMENT);
+    }
+});
+
 function wearAttachment(attachment) {
-    MyAvatar.attach(attachment.modelURL,
-                    attachment.jointName,
-                    attachment.translation,
-                    attachment.rotation,
-                    attachment.scale,
-                    attachment.isSoft);
+    if (attachment.type === AVATAR_ATTACHMENT || attachment.type === AVATAR_SOFT_ATTACHMENT) {
+        MyAvatar.attach(attachment.modelURL,
+                        attachment.jointName,
+                        attachment.translation,
+                        attachment.rotation,
+                        attachment.scale,
+                        (attachment.type === AVATAR_SOFT_ATTACHMENT));
+    } else {
+        attachment.entityID = Entities.addEntity({
+            name: "attachment",
+            type: "Model",
+            modelURL: attachment.modelURL,
+            parentID: MyAvatar.sessionUUID,
+            relayParentJoints: true,
+            position: attachment.position,
+            rotation: attachment.rotation,
+            parentJointIndex: -1
+        });
+    }
 }
 
 function removeAttachment(attachment) {
-    var attachments = MyAvatar.attachmentData;
-    var i, l = attachments.length;
-    for (i = 0; i < l; i++) {
-        if (attachments[i].modelURL === attachment.modelURL) {
-            attachments.splice(i, 1);
-            MyAvatar.attachmentData = attachments;
-            break;
+    if (attachment.type === AVATAR_ATTACHMENT || attachment.type === AVATAR_SOFT_ATTACHMENT) {
+        var attachments = MyAvatar.attachmentData;
+        var i, l = attachments.length;
+        for (i = 0; i < l; i++) {
+            if (attachments[i].modelURL === attachment.modelURL) {
+                attachments.splice(i, 1);
+                MyAvatar.attachmentData = attachments;
+                break;
+            }
         }
+    } else {
+        Entities.deleteEntity(attachment.entityID);
     }
 }
 
 Script.scriptEnding.connect(function() {
     hatButton.destroy();
     coatButton.destroy();
+    coatButton2.destroy();
 });