Rereview Request for PR #7774

[gal michaeli]

Hello,

I have submitted the proposed fixes after having PR #7774 reviewed, and would very much appreciate it if those fixes could be reviewed as well.

Thank you for all your hard work.

Regards,

Gal

[gal michaeli]

Thanks for the quick (re)review.

Unfortunately there were still some issues which required fixing.

I've applied the suggested fixes and have updated the PR.

I hope these are satisfactory and up to standard.

Regards,

Gal