Merge "Revert "Refactor Satellite APIs"" into main