Hi,
I have updated the patch file with the remaining fixes.