disable services
Merge branch 'disableservice'
resolve conflict