Merge "Subscription Forwarding Fix"