Moving it to after the blocks where per-item results are calculated, as it's not used there and causes quite a performance hit being there. Fixes #21340