Merge "Prepare for switch to idmap2"