Add suspend and resume commands
Merge branch 'develop'