Merge "Revert^2 "reflect the refactoring for satellite API"" into main