Maintain alphabetical order of service definitions
Merge pull request #5217 in master
Merge pull request #5169
Merge pull request #5169 in develop