Removed stop property from repository
Changed from Extended Attribute call to Uuid property and added exception handling
Merge branch 'rc/2.0.0' into develop