Merge "Sort the selectable subscription by id" into main