Pswadi/add stop n approve

Describe your PR

/cc @zendesk/samson

### References
 - Jira link:

### Risks
 - None