FWIW this isn't yet in the ESR version.
(Extended Support Release, targeted at corporations but better for everybody who doesn't want rapid changes.)
I would recommend switching to the ESR version, as a temporary step to buy time while you figure out the longer-term plan *EXCEPT* (big but!) there's a huge problem with that measure.
+
@mcc
If you're not already using ESR, the experience of switching is horrible.
When I did this to work around a Firefox bug which broke some of my constantly-used extensions, I found:
If you switch from a newer version to an "older" major rev, Firefox deliberately discards *all* of your settings and personalization, on the grounds that the new ones *might* possibly be incompatible.
AFAICT restoring them requires figuring out the profile files and their format and editing them directly.
+