Merge pull request #4982 from stintel/iiod