It seems as IntelliJ has messed up the indentation in the example listings. Is there any chance you redo just the actual change with XXE? I wanted to do it myself, but it's really hard to identify the actual change. Apart from that it looks good, so you could merge it to master if you like.