Merge pull request #10157 from eileenmcnaughton/iida3