Service Template Tool service -> Tool service
Merge branch 'tool-service'
Service Template Tool -> Tool