Vendor changes for stonecore as well as teleporter