Merge "Revert "Add UID parameter to authentication token""