The main change here is 4de32ed9 (3dcf8d65 fixes an obscure issue I'm sure almost no one has ever encountered, and in its current form depends on the renaming in 8c04b6a7.)
I believe it should be safe to either cherry pick just 4de32ed9 or merge all three commits into a release branch.