Merge "Revert^2 "Refactor Satellite APIs"" into main