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