Comment 11 for bug 2033287

OK, so after doing a cursory glance at the patches and checking it passes the CI, I've merged these to prevent further divergence. We can add any further commits on top if needed later.

Thanks for the contribution!