Add service aliases

Closes #3593458

Merge request reports

Loading