SI-8835 Fix implementation of Iterator drop to remove quadratic behavior
Merge pull request #3963 from erikerlandson/si-8835-pr

SI-8835 Fix implementation of Iterator drop to remove quadratic behavior