Fixes #5146 adds upgrade service
Merge pull request #5511 from cash/upgrade_service

Fixes #5146 adds upgrade service