Merge "Change the logic of Service Registration"