Thanks for brainstorming (and of course, thanks for doing the work)
My thoughts:
• Re cherrypicking:
◦ This is a bugfix for a long-standing bug, rather than a recent regression
◦ This is a fairly large change, and thus cherry-picking introduces risk of interfering with stabilisation of the 2.26.x branch in particular (e.g. risking delaying that release, and all of its contents)
◦ All together, I was personally thinking this isn't one for cherrypicking
◦ This is a moderately strong personal opinion, i.e. I'm happy to be convinced otherwise
• Re release notes:
◦ Even for cherry-picked changes, we play games with release notes, and include notes in the series that'll have the first .0 stable version that includes the fix, rather than the earliest series that includes the fix at all
◦ Thus, in this case, it'd be 2.26.x, since it'll be in 2.25.3 or something (if cherrypicked to 2.25.x)
That said, shuffling release notes around is easy enough so I'll review 22128 and we can fine-tune the cherrypicking/release-noting later.