Merge "Refactor Satellite APIs" into main