An addendum of #5186. We need to backport the same changes to 7.17-8.9. We previously merged these changes to main and versions 8.14-8.10.

NOTE: We may need to check out branches individually to avoid merge conflicts. Also note that this caveat of upgrading to 8.8 should only apply to 8.8.0+

NOTE: Upgrade instructions for 8.x > 8.x minor need to be added to all 8.x branches.