To be clear, as I said on Slack, this ticket isn't to merge to the main branch (in this case lsst-dev), this is just for you, to get the v25 release working, so do with it whatever you need (I opened the PR to lsst-dev so you could see the clean diff which it should give, but I don't know what your branch is called, so left it like that).
Merlin Fisher-Levine
added a comment - To be clear, as I said on Slack, this ticket isn't to merge to the main branch (in this case lsst-dev), this is just for you, to get the v25 release working, so do with it whatever you need (I opened the PR to lsst-dev so you could see the clean diff which it should give, but I don't know what your branch is called, so left it like that).
Looks good to me. Maybe add some more details to describe the problem.