Removed automated start_stop calls
Merge branch 'refs/heads/feature/start-stop-fixes'