Merge "Fail idmap parsing earlier if version differs"