Merge "SatelliteAccessController enhancements to handle delete user scenario" into main