Merge "Add additional fields into SatelliteAccessController atom" into main