Not shutting down the FSM untill the delete is confirmed.
Fixed waiting for delete.
Merge branch 'test' into dev