Merge "Add UID parameter to authentication token"