Merge "Refactor satellite APIs" into main