Merge "Revive DeadZone" into oc-dev