Rewrite iterator behavior to correctly jump from index to index
Merge remote-tracking branch 'origin/develop' into develop