UPdated Discontinuation of Service
Merge origin/master