[#4821] - Fix some missing iids
Merge pull request #4897 from rtripault/iids

[#4821] - Fix some missing iids