i2i upscale disregarding folder batch process

I want to upscale several pics via the i2i batch process - but only the image which is loaded on the i2 tab is processed -- and not those from the input folder.

I guess the issue came with an update not long ago.

1. If there is no single image loaded on the i2i tab there comes an error

File "E:\SD\forge\webui\modules_forge\main_thread.py", line 30, in work
self.result = self.func(*self.args, **self.kwargs)
File "E:\SD\forge\webui\modules\img2img.py", line 246, in img2img_function
processed = modules.scripts.scripts_img2img.run(p, *args)
File "E:\SD\forge\webui\modules\scripts.py", line 792, in run
processed = script.run(p, *script_args)
File "E:\SD\forge\webui\scripts\sd_upscale.py", line 40, in run
init_img = images.flatten(init_img, opts.img2img_background_color)
File "E:\SD\forge\webui\modules\images.py", line 847, in flatten
if img.mode == "RGBA":
AttributeError: 'NoneType' object has no attribute 'mode'
'NoneType' object has no attribute 'mode'

2. If an image is loaded -- only this single image is processed - despite having input and output folders filled on the batch tab

version: [f2.0.1v1.10.1-previous-616-g98e0adcc]
(https://github.com/lllyasviel/stable-diffusion-webui-forge/commit/98e0adcc78c1641cc9352bfdad8843bfb49cfc19)

Start at scripts/sd_upscale.py and follow its invocation from modules/img2img.py, using the traceback through modules/images.py as the initial path. Reproduce both i2i batch cases with an input and output folder: processing should use the folder images and should not require a separately loaded i2i image.