Adjust generation batch offsetting.

Adam Vesseyrequested to merge
issue/filehash-3543131:3543131-hash-generation-batch into 3.x

Also, address terminal condition.

Closes #3543131

Merge request reports