Commit of Shelf changes and added disarm trap