Merge branch 'ghaff-main-patch-99798' into 'main'
Subbed Satellite for Smart Management along with other minor changes mostly to...
See merge request !1243 (merged)
(cherry picked from commit 02711154)
e7bc80c5 Subbed Satellite for Smart Management along with other minor changes mostly to...