Bug fix - subscriber_id not handled in SDK