stop/start objectes instead of delete/new them
Merge branch 'master' into nodelete