Merge pull request #21554 from eileenmcnaughton/loop