OK left a comment on the PR, it seemed to work! Let me know if there's any other scenarios we should test.
It was a miss on my part in not testing the original PR #7803 enough - I'm feeling more comfortable setting up different local test cases now and will try to be more thorough for future changes 🙂