Python 3 compat iterator
Convert last remaining cases of generating JID manually with utils function
Merge pull request #19241 from jacksontj/develop

Python3 compat iterator