Merge "Sort in slot selectable subscriptions first" into main