Fix for federated message flow to support source IDs.