Merge changes from CIDI