Merge "Migrate Adaptive Connectivity" into main