Merge "Revert "Improve idmap2 xml parsing""