Merge "OMS: extract verifyIdmap from createIdmap"