Merge "SatelliteAccessController enhancements to handle Multiple User" into main