Merge "Add RemoteAuthService" into main