Extract useful parts of #4816 and apply to changes from #5490

[dlmarion]

#5490 (comment)

Should extract the useful bits from #4816 and merge in separately. Most importantly, want the IteratorEnvIT changes which will test the changes done here.

[kevinrr888]

completed by #5525