Not sure why the cherry-pick action is failing; I did have to manually resolve a merge conflict (maybe that's the issue?).

Hey, any chance this can be merged?

I tried to rebase this onto staging-next, but it conflicts currently for the last commit (envision)

That's fine; let's just get this merged into 24.11 staging.

Not sure why the cherry-pick action is failing; I did have to manually resolve a merge conflict (maybe that's the issue?).

That action shows diffs to the supposedly cherry-picked commit and is there to prevent code injection in a backport.

That action shows diffs to the supposedly cherry-picked commit and is there to prevent code injection in a backport.

I know, but I did cherry-pick the commits. You can see that from the commit descriptions.