Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136