Hello Mark,

For #10444 : I made changes regarding this hop it it will work fine.

For #10442 : I will review the tasks and if any query then I will inform you.

Thanks