Merge "idmap2: switch to improved Result class"