more robust XML Parsing and comparing
Merge branch 'hotfix/failSafeAdapter' into develop