Pswadi/add stop n approve


Describe your PR

/cc @zendesk/undefined

### References
 - Jira link:

### Risks
 - None
This logic may not be what we wanted?