Merge "idmap2: introduce improved Result class"