Merge "idmap2: move Idmap.h to Result"