Merge "Fix NPE in TestSatelliteService" into main