Merge "Introduce multiple satellite controller atom per carrier id" into main