Merge "Satellite API changes"