Apologies for the Inconvenience, Yoann Congal.

Yes, I have tested and verifed both fixes by building recipes for the scarthgap branch.

Thanks,
Krupal