Merge "Add a helper class for filtering available subscriptions"