Merge "Added check of callback URL in service registration"