Merge "Rename AdaptiveAuthenticationService" into main