Aligning with upstream IDM changes