Merge "Revert "Revert "Rename CONNECTED and NOT CONNECTED to IN SERVICE..."" into main