added fields to ErrorReport.xdp
Merge branch 'master' into test
Changes from the server