Merge "Reflect satellite api refactoring to Settings" into main