Merge "reflect the refactoring for satellite API" into main