Merge "Subscriber Management"