stop service helper
Merge branch 'hotfix/stopService'