Merge "Guard new satellite APIs with feature flag" into main