Cleanup of an iterator that would never break early.
Merge remote-tracking branch 'origin/development' into development