Closing #7 (REST services are not properly stopped)