Merge pull request #17088 from eileenmcnaughton/ids2