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