Add: Proper filestreaming support for sending xml
Fix: Merge Conflict