Hi,I think there is still some problem with the patch. I am not able to apply it to the master branch.
Can you please take another look at it?
Thanks,Akshat Jaimini