Merge "Fix idmap2 uninitialized variables"