Thanks you! As you noted in#23998 there was already another PR opened. It is not clear which will be merged (although most likely we go with the first if that gets up to shape), but in case you want to complete this one, what is additionally required is a test. This is discussed further in#24028 as it is missing there as well.

Also, there are a number of linting failures.

Finally, in general we prefer to not merge the main branch into a PR, but to rebase the PR onto the main branch. In your case you can do something like (in your branchemma's-branch)

git rebase -i main# An editor will pop up, remove the line with the merge, save and closegit log# Confirm that you only have the two commits with your changes as the two last onesgit push origin emma's-branch --force-with-lease

(You can also usegit rebase -i main and selectfixup to get the number of commits down, usually a single commit is preferred/enough for a PR.)

Edit: note that you probably donot want tofixup the merge commit as that may completely break things.

I'll close this as a duplicate. Please work in the context of the original PR. Thanks for your contribution!