Merge "idmap2: fix for compiler update."