Migrate changes from the release-5.0 branch to main

[jamezp]

We look to be in pretty good shape with really only one commit missing. This pull request does include two commits, but one is an undo of something from the first commit.

The only other commit we could potentially want would be #1210. However, we could do that separately once we decide what we want to do there.

[mkarg]

Thank you for investing your time to sort this out! 😅

I'm +1 for adopting #1210, but I am also okay with deferring this question post merge. And yes, please drop all unused branches and update our branchlist in our wiki accordingly (as we tried to months back).

[spericas]

LGTM

[jim-krueger]

+1, Thanks James!

[jamezp]

Are we able to fast track this one given it was already merged into another branch?

[arjantijms]

Are we able to fast track this one given it was already merged into another branch?

I'd say yes

[mkarg]

Are we able to fast track this one given it was already merged into another branch?

Once a commit was merged into any branch once (i. e. it successfully passed all our rules and votings), there is no additional waiting time. It can cherry-picked into any other branch immediately, without any new PR needed. At least there is no rule (neither in the Eclipse Developer Manual nor in our own Committer Agreement) that forbids that.