Backport PHP 7/8 fixes from 3.8 to 3.7.
This will be fairly easy since 3.8 is mostly changing the UI and API schema.