BBB-97: Fix for preventing XXE vulnerabilities