Merge "Handle hidden subscriptions for different cases."