Updated the patch series as per Ludo’s feedback.

Thanks,
—Ivan